OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:04 +0000 (17:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 00:13:04 +0000 (17:13 -0700)
commit4d9f13dd0fcefad9ce2e27f3b48bc0e4ba3fb9b1
tree00c2d5d58bef976749ab01d29b4786046117dcfa
parent9d80f7085707abd8f088c4f0c4d66cd666a6feb0
parent3fd8e2e1e1e5762980e98c2b070b168a030d19c3
parent0104e31bdca0dc94e6020e3cb8922328573b9c0c
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Iefcd2a29c958299abc4cdfd7217f6f3deb7d483e