OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:40 +0000 (14:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:40 +0000 (14:20 -0700)
commitf2d744d9535ca59be6cd878830176f81a0a8fbc6
tree52196feaa278c3c4933a1d5c973f684ea8e16e08
parentb0177ff25e3e620be6ebe1e2c3f645b2f05dd57e
parenta0e0adee5fbea1457996b0ac6a4c15bea4c1acb0
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I48e936434971feedd176c2d5eafd0fdf43b75f74