OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 21 Jul 2013 01:25:23 +0000 (18:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 21 Jul 2013 01:25:23 +0000 (18:25 -0700)
commit62eda460c411b21dce28b8ea6a9ee9245d896dd5
tree9816b25a4d8b4c0505c49eb1e8873e69758dfb30
parent7017cfe124721cadd3315a0a5700c83545916673
parent863f6120e6948e1b0956da5519a221ae0f5d81e1
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I68646ef2af902737659f0874fc2bb17612747c3a