diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2011-02-16 10:58:34 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-16 10:58:34 -0800 |
commit | 5a5b4ba9fe40605d5e43b7ff25a58f7174509a53 (patch) | |
tree | 175fdb71c62b0c53537040c84011ea54572aa069 | |
parent | 8761bfaa8d8755eab65c21b6cb1a0affeefbbe56 (diff) | |
parent | 271397cfb2b79d1346568209b37b1f57707f924a (diff) | |
download | frameworks_base-5a5b4ba9fe40605d5e43b7ff25a58f7174509a53.zip frameworks_base-5a5b4ba9fe40605d5e43b7ff25a58f7174509a53.tar.gz frameworks_base-5a5b4ba9fe40605d5e43b7ff25a58f7174509a53.tar.bz2 |
am 271397cf: (-s ours) am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '271397cfb2b79d1346568209b37b1f57707f924a':
DO NOT MERGE - backport of l92a02b31 from master
0 files changed, 0 insertions, 0 deletions