commit | cca053a389bf913f23796e1095db9e1ae74bf2f0 | [log] [tgz] |
---|---|---|
author | kmccormick <kmccormick@google.com> | Tue May 14 11:29:16 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 14 11:29:16 2013 -0700 |
tree | 33e2290f751dc2d9e40ed6500a7bb18e162d128e | |
parent | 80127981f85a0be842007596830c1675a9a3665e [diff] | |
parent | 3722947f2f22b9b56a7479bd29af2680e608f674 [diff] |
am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev * commit '3722947f2f22b9b56a7479bd29af2680e608f674': Doc update: manual merge of changes from jb-mr1.1