| commit | 15060a5ca7f2455a3674792ae8b94536c913174e | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Jul 03 14:26:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 03 14:26:29 2012 -0700 |
| tree | 4f9a917a3f6ffd953dfa471d745065c0149bc352 | |
| parent | d86deb31a5c917462335b6ecb39362c8cc93d467 [diff] | |
| parent | 43eb9a78c3ca49c0e4de95a3f048bc0b9c6acc82 [diff] |
am 43eb9a78: (-s ours) am 3e926e05: Merge "Update doc package to r2. do not merge." into jb-dev * commit '43eb9a78c3ca49c0e4de95a3f048bc0b9c6acc82': Update doc package to r2. do not merge.