| commit | ce4c103492c00e98b2f40cfef8b4b138bf16e8ca | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Apr 11 21:24:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 11 21:24:53 2012 -0700 |
| tree | 2d11ee3917132a6dd5c0aa8b79e2cbb1e8233ea0 | |
| parent | 4d27ed44f9ba5dd940cec70ccb650e0d8da49524 [diff] | |
| parent | 2cec767b8a90fcb913f7689bb20d1fe6f437cced [diff] |
am 2cec767b: (-s ours) am 3d33c68f: am d9818244: Merge "DO NOT MERGE: Make component names visible in javadoc." into ics-mr1 * commit '2cec767b8a90fcb913f7689bb20d1fe6f437cced':