summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-11 12:34:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-11 12:34:30 -0700
commit1d0c7e05d80ab18c1a859782313448dc6a31bab9 (patch)
tree165e040c73f9f3666612ca78b13c24b722e4d5ce
parent46e9befbe45e0d53c7ad1cb0f570865c08335aab (diff)
parent6e5236ee082070242f6e5e6e0fe0d1892368880e (diff)
downloadlibhardware-1d0c7e05d80ab18c1a859782313448dc6a31bab9.tar.gz
am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '6e5236ee082070242f6e5e6e0fe0d1892368880e':
0 files changed, 0 insertions, 0 deletions