| commit | 36f9ca38266580c7bdac9c83a03a2b60daddf3a9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 14:20:58 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 14:20:58 2012 -0800 |
| tree | 52610baba474df56aca468336f7da3b89a91b645 | |
| parent | a6f376792eb8910ee4a76d59b48ebe5fcd2f4aec [diff] | |
| parent | 17e06817a22f2a13baddec627dbf385d8799a604 [diff] |
am 17e06817: Reconcile with jb-mr1-release - do not merge * commit '17e06817a22f2a13baddec627dbf385d8799a604': JOP39