| commit | cd6b8e49a791619cf658515abfb2ffdc445b4ef7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:37:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 09:37:54 2013 -0700 |
| tree | b6cbb6a060d7fbc6a3cecf155630510c9df33b1c | |
| parent | 6098c5d3555860f272d8ddbd353a42f4c8474e1c [diff] | |
| parent | 59734490f6a4f46308c39368a7b20f4fcf5e0e97 [diff] |
am 59734490: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '59734490f6a4f46308c39368a7b20f4fcf5e0e97':