| commit | f2e1154f83ff0e02405544268b62fbad2ae25125 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 10:08:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 10 10:08:22 2013 -0700 |
| tree | cbb8580da17f4350d0dfd8650a7af6d58a3fa612 | |
| parent | f389189dff0cfb4c449991a1385c23695894cc2e [diff] | |
| parent | 42683cc2cea897d4696b233c48bfd7d49f5dab46 [diff] |
am 42683cc2: Reconcile with jb-mr2-release - do not merge * commit '42683cc2cea897d4696b233c48bfd7d49f5dab46':