| commit | 93420eeb38139bef8b7113582343339239dd3174 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:25:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 13 08:25:38 2013 -0700 |
| tree | b95a2c4beb6ab3a8660af77933357c0c75c82637 | |
| parent | ff8fbf095665cf10922957d90317bc6319bbc3dd [diff] | |
| parent | bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1 [diff] |
am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'bb3a943d1bd9cb8f7cca76850d432cfb2a6307e1':