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:35:04 +0000 (08:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:35:04 +0000 (08:35 -0700)
commit9201798cd99d0578fb781aea03635304e49ee3f3
tree3610434840f2e9041aa92ce746e9b28cd917804b
parent47f31b19811a177baa1ae868282374970295caeb
parent176c0fdd5b420177d4996b47aaf66c703e5cbab3
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I5445989fd1dd6e851d3efe060cf3fc4ae1d104fb