OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 15:22:27 +0000 (08:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Jul 2013 15:22:27 +0000 (08:22 -0700)
commitd8d0c17e22f42597497e8f9f5c134621e399e22a
tree00c2d5d58bef976749ab01d29b4786046117dcfa
parent7c8042a39858bc42e3eb5ede616acbee7e8a3f06
parentc80dc3e407c6c5455ec43c06e861f79b2ef66c2b
parente17c7f4324a64fa260aaece10cb8565a659663c7
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448