| commit | 806cac729996161f216460f67081857737d585ea | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Tue Oct 09 14:01:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 14:01:15 2012 -0700 |
| tree | 979627b7d6a6e79204c71114310a2a5629e0e2c2 | |
| parent | c764e04c54aea6aa6cc6890a35d8f97463a50b32 [diff] | |
| parent | c1a8e1ec87d74dbb167ff575e8507183045584cd [diff] |
am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev * commit 'c1a8e1ec87d74dbb167ff575e8507183045584cd': SDK JB MR0: doc is 16 rev 3