summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-09-17 14:43:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-17 14:43:45 -0700
commit6c1c1326f2688fbbdffd07fe869df3b2d67f50fd (patch)
treedb29654dc0bc276a062d9b32c90fe66c9d2e3271 /target
parentf5a44d0f4f788659bccd534b0679f32601ecf3c8 (diff)
parent5660cfe1d48306bdcba10b4989a720fd247fa828 (diff)
downloadbuild-6c1c1326f2688fbbdffd07fe869df3b2d67f50fd.zip
build-6c1c1326f2688fbbdffd07fe869df3b2d67f50fd.tar.gz
build-6c1c1326f2688fbbdffd07fe869df3b2d67f50fd.tar.bz2
am 5660cfe1: (-s ours) am 50ba3615: am fd14e242: (-s ours) Reconcile with jb-nakasig-release - do not merge
* commit '5660cfe1d48306bdcba10b4989a720fd247fa828': JGO77 JGO76
Diffstat (limited to 'target')
0 files changed, 0 insertions, 0 deletions