summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-11 12:28:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-11 12:28:32 -0700
commit5c8f84a15fba998baf9703c81e86a25048ce368a (patch)
tree666c555c513847cfafffb006cd7ae40c9271db84
parent48697f6dc249d1238243677de77d3a0eb6a17b3f (diff)
parent3a18bcccb201b37e5b0cdff76febafb214cb8b90 (diff)
downloadlibhardware-jb-mr1.1-dev.tar.gz
am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '3a18bcccb201b37e5b0cdff76febafb214cb8b90':
0 files changed, 0 insertions, 0 deletions