| commit | 40e7da907be0336dbf134fa5f3fd54541c7dc3e5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 28 09:49:30 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 09:49:30 2012 -0800 |
| tree | be3add561e3082a49860d936c8555b94e6f9623d | |
| parent | 47650f5754e1b3c4071e104cabcf62ca1fb8cdf4 [diff] | |
| parent | eb2ae702aff506f30346ff4bf1c056453859b5f5 [diff] |
am eb2ae702: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'eb2ae702aff506f30346ff4bf1c056453859b5f5':