commit | bd549fe0bb00a906579be5bd8666578f4a5e39f9 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Wed Jan 26 11:43:31 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 11:43:31 2011 -0800 |
tree | 6e26a82c5f7b100803859f4dbe5d13320a7e664a | |
parent | 1436341b4fa6a6e6f0e361defe65ece2397e8e0b [diff] | |
parent | 7dbf0696ef37097f2bcec058f876f7f4ba63d357 [diff] |
am 7dbf0696: resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp * commit '7dbf0696ef37097f2bcec058f876f7f4ba63d357': Make ObbActionListener a on-way call