| commit | 7c2ea974834b2aa3f416aff4962fdd7bbec8a51f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:33:43 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:33:43 2013 -0700 |
| tree | 02cd25f58b24514a6ad863554856496508360d37 | |
| parent | 9058a6c88190d1f7738f59830d34ef141af61048 [diff] | |
| parent | e8fd9000700e36e2548099cef94387c69f8b6d15 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Id0d9eb3205906b409e735546b988f43a3bdcc0ae