| commit | 086dd3377c5e460d578a7bdc9384af79f8bdd3c6 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Sep 24 18:10:18 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 24 18:10:18 2010 -0700 |
| tree | 4617e341efa439dca6187614a3291c0860e99e1c | |
| parent | 1cf11617d301270fb12575db798ac3ef6ba4d39a [diff] | |
| parent | afb309d573fa881dee4e97eb5e472e76fd8d69f3 [diff] |
am c388844d: (-s ours) am 234e42df: DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.* Merge commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d' * commit 'c388844d50a67ecd8eb93d29d618bae1fa3a3c5d': DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*