OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:33:50 +0000 (07:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:33:50 +0000 (07:33 -0700)
commit151db1a657b83ee2a8ebfcea07eddef22b6bca6d
tree398f5ad820fcad10816e2f9f74b009ad8c3312d2
parent9bf263b25143939e69c37cadba36083483681994
parent9e46cc01a439bfee3f4efc889840db0f23770f0c
Reconcile with jb-mr1-release - do not merge

Change-Id: I9de953cb5d49ea43902882573b01bc91f74d4953