| commit | f448d2e0b05bb13fa348f455714ffd1ac49eda2b | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Tue Oct 16 22:07:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 16 22:07:56 2012 -0700 |
| tree | 01610dec479020fa54355b283d31f8c58b1c59f3 | |
| parent | 43f272afd56a57640c62c952f9266478bacf0244 [diff] | |
| parent | 8a0cbe1bcb3e605f194c79c014c4ee5ef6047528 [diff] |
am 8a0cbe1b: resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp * commit '8a0cbe1bcb3e605f194c79c014c4ee5ef6047528': resolved conflicts for merge of 4385882c to jb-mr1-dev-plus-aosp