OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:38:34 +0000 (07:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:38:34 +0000 (07:38 -0700)
commitf93f5bf4a48df3b1557734a1e945b9556ce16f92
treee83e04aa7c3d53957be6b8c4e3cdf0ed94f6bf1b
parent954f6afed22e8a723ddb9a6448c14bce4e008a9c
parent1b59ac59bb1c1f28bd40b09cd0995db873e25692
parentfd2dee0196e7e06779c3bb7b90be3f2ef9e8220d
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I427041221d8f8f3237c806f3d8a3f67c0b3a4242