OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Jul 2013 16:37:51 +0000 (09:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Jul 2013 16:37:51 +0000 (09:37 -0700)
commiteddcf88e64f353be6a85f900e9443583adfe3a65
tree6eeee10bca8f85b8e70dce01b2111989fd19e22e
parentff2b0d7f79283665ad3d1fee8a96b3455be7f91d
parentceea6ac47e99cd3276ba53ec77bfff570f6dd32e
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Ib1fa3361941e032e0ff6137b37ef14eee2e794b2