summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-11 12:41:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-11 12:41:50 -0700
commit75bcd737770f85114673c4411b8e2ecc0dd32bdf (patch)
treede4b9fce9ad3e87543de1a4335f9f1d3d97d426c
parentf53f9c6d3668490f6c68f5c094c28f645c1b3da3 (diff)
parent4ddcb75861cfb2835fcc20f2071222d2f55450ba (diff)
downloadnative-jb-mr1.1-dev.tar.gz
am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':
0 files changed, 0 insertions, 0 deletions