commit | 3b0929f2a4238cafcf76acd63790cfab8674865b | [log] [tgz] |
---|---|---|
author | kmccormick <kmccormick@google.com> | Tue May 14 11:30:47 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 14 11:30:47 2013 -0700 |
tree | 13e0230e028a86d46db5078cd0732f4364144765 | |
parent | 06ccc77f4849f9f9fc6ef33cd5ef6cfd00898d00 [diff] | |
parent | cca053a389bf913f23796e1095db9e1ae74bf2f0 [diff] |
am cca053a3: am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev * commit 'cca053a389bf913f23796e1095db9e1ae74bf2f0': Doc update: manual merge of changes from jb-mr1.1