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