| commit | 450655c10b9ab5aded4350c77a010c2595586ead | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sun Jun 16 07:45:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jun 16 07:45:34 2013 -0700 |
| tree | 09627f85c733f844af02daed570a8c3a35ff1087 | |
| parent | 8147a6ddfd54079ef89f90bf2b5ed3ab6f59bbc0 [diff] | |
| parent | 05e87d536ed2b7cf1d68135121b630031e5d56c2 [diff] |
am 05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '05e87d536ed2b7cf1d68135121b630031e5d56c2':