OSDN Git Service

Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 15:09:26 +0000 (08:09 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 15:09:26 +0000 (08:09 -0700)
commitc53ce26836eccfe9c0bb315d965bc73a9bd7b214
treecca1af56672925512aa578e322d69b66823bd2ee
parentc5fc6231312b21efb601367bae28d63f9b26ac52
parent9f1ebc22727b6d69e0964fd50ba144bb214e67d2
Reconcile with jb-release - do not merge

Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de