| commit | 90a4e7cd26295545480226ac584aedf3cd50c6fd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 10:17:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 10:17:25 2013 -0700 |
| tree | 49c9c5594e16483a5253394fd1c949fb03e8d261 | |
| parent | 215885bd98b302da4c4c1c42f657e01051374bb3 [diff] | |
| parent | c66da1fbd7a028190bc737c60812321a91e4724d [diff] |
am c66da1fb: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'c66da1fbd7a028190bc737c60812321a91e4724d':