summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-15 07:37:49 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-10-15 07:37:49 -0700
commit165c67aacd8c6e8e6ffe57e673602952e4b56219 (patch)
treec56b4311abbba7aa7c0a73e7b53cf113a81c5fb4
parentea718cdb7834444512c376942020bba88a9e9ed0 (diff)
parent3ccd6ed310e118cbe3211c3114ec5a09141960c8 (diff)
parent8a0808b3cd42bbd2ed259412e1a5e6faf70f18c8 (diff)
downloadbuild-165c67aacd8c6e8e6ffe57e673602952e4b56219.zip
build-165c67aacd8c6e8e6ffe57e673602952e4b56219.tar.gz
build-165c67aacd8c6e8e6ffe57e673602952e4b56219.tar.bz2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I03093891a09e5cee2fee0838930b0578d31bb5fa