OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:34:29 +0000 (08:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:34:29 +0000 (08:34 -0700)
commit7c8042a39858bc42e3eb5ede616acbee7e8a3f06
tree00c2d5d58bef976749ab01d29b4786046117dcfa
parent4d9f13dd0fcefad9ce2e27f3b48bc0e4ba3fb9b1
parent0e6cd798b8a7e3775670547b5ec9010d7c074071
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Iab96df1946b1b94645b5e9f99a5bb37178987944