| commit | 4707218d663bd4cc30debdab4189200ad320e918 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu Oct 11 22:50:00 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 22:50:00 2012 -0700 |
| tree | 86d25aa684aa712602a2875c5606d9a47679e3c7 | |
| parent | 0fd55ba58eee50c65bc52ce44f7374e91ac83b54 [diff] | |
| parent | d33e3775c8785bf6b93787058b9c779b67860368 [diff] |
am d33e3775: resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp * commit 'd33e3775c8785bf6b93787058b9c779b67860368': resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp