| commit | 5c76c459554161638f7d16c41ba03e8dfd350206 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:48:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 15:48:49 2013 -0700 |
| tree | 0a02bd3e07c154b2ac8e7633f04642e8a1f5089c | |
| parent | ea98ef04558adf0ee5c504d9067fc2a02b78238b [diff] | |
| parent | accb2c4fb8962ba732a50f6211684073bdf1423e [diff] |
am accb2c4f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'accb2c4fb8962ba732a50f6211684073bdf1423e':