OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 23:41:39 +0000 (15:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 29 Nov 2012 23:41:39 +0000 (15:41 -0800)
commit01c11f67fd31d693f00c9c5a961ca251699d233b
tree1f789235e7c465018d77fe934298b7b4f6b55bde
parentc6f60a98940945bbf067c2ba8eabc6184e568b02
parentbf3e6ab482ab8704f5a8028b9c75e4868a048c51
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I86943fad736a17b095608fdd4a98411979e31694