OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:35:35 +0000 (15:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Jul 2013 22:35:35 +0000 (15:35 -0700)
commitcb7f5b94a3d683f297ddf839ca4aa897e0927139
tree15bf4a8edf1aecdf2bf59b3f88c5ba3e07a923b6
parent43c754f49c0cbd31f3a067b6bff4b98829cb3811
parentf780878cd25d59a1e412ff09d141b5ca73b8ba34
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I2c24ec07adc57969cc48647a07afca7337923d51