| commit | 2903a0bac33dc8bd560535965d5276bfffd1df3f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Mar 29 09:50:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 29 09:50:35 2013 -0700 |
| tree | b8ed78cd0da81e97caf519d1133ccbb515205a67 | |
| parent | a3ce0bb1adc77899669b3c870af03d5be3c811d7 [diff] | |
| parent | f9e4a6e93b2d0ca6f2fd01547a04b63a94257a29 [diff] |
am f9e4a6e9: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'f9e4a6e93b2d0ca6f2fd01547a04b63a94257a29':