commit | f82ab455aaf208403e836b14eaf480133f5345d8 | [log] [tgz] |
---|---|---|
author | Wink Saville <wink@google.com> | Thu Sep 29 17:03:24 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 29 17:03:24 2011 -0700 |
tree | 8385d76551339e5c0248815bac31f83e5b29581e | |
parent | 53f0bea80a337a981fdace64bd6f437312a8d137 [diff] | |
parent | de784d913123376a886b5e8c4e619b7f87484c5f [diff] |
am de784d91: (-s ours) Cherrypick 3bfbbe2 from master. do not merge. * commit 'de784d913123376a886b5e8c4e619b7f87484c5f': Cherrypick 3bfbbe2 from master. do not merge.