commit | bbea7710b77974ea35b423f4db692dfe98731143 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Wed Nov 10 14:55:48 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 10 14:55:48 2010 -0800 |
tree | 1a3c683f8da28300d3c93bea95b96290d9e30dbe | |
parent | a8422af09e3bb2a51eff357ec02bf60f5f4cb79c [diff] | |
parent | ee6ceed44aa5d6bb88de8ee1e3cf351754667eac [diff] |
am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread * commit '77f5c9542e159cb9f2f2908227212d4add8ce74c': docs: remove "new" tags from sample apps