OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:29 +0000 (09:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:44:29 +0000 (09:44 -0700)
commit3ac9bd7eb423a46e9d5cc58f09b5f7dbe91a2f1b
tree0219c3bce8984d3dc2ad402c5e7a48e10cefdf74
parent0d19b574cc9f12c4c042cb7070757e3c85c7301f
parenta1970f4a9a902b63104d65c9f95ba062a3391200
parent739c59aaa2f002c01e52bfe8d42e7068d75c81d7
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I0a56a7cd77b8d52e699455b6bd01b884bcc32bc4