| commit | 6677951135f6062c678f98af2f8fb42f8241ae9b | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Thu Aug 02 15:39:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:39:55 2012 -0700 |
| tree | b81b3508f97f238f89be23432611022f316dd831 | |
| parent | f95f3ebf12bf9ee23b8ed4e940ab007cbc22f3f3 [diff] | |
| parent | 265eea82ae24b5620dc84fa6c51ba72aca9a1cf6 [diff] |
am 265eea82: am 568db47b: Merge "Doc change: add trademarks attribution." into jb-dev * commit '265eea82ae24b5620dc84fa6c51ba72aca9a1cf6': Doc change: add trademarks attribution.