| commit | 652538d6afa2474820382be393e3a748723a9f1a | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Tue Oct 09 14:05:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 14:05:24 2012 -0700 |
| tree | 60acfb161b358e1be3662f8721e4f19fff0bc984 | |
| parent | bf2920e3ab5bed17685101b58e9e66a4dcc59a7e [diff] | |
| parent | b41080c00b357c33cdf22e36bc8d3aa0f3510ca5 [diff] |
am b41080c0: am 806cac72: am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev * commit 'b41080c00b357c33cdf22e36bc8d3aa0f3510ca5': SDK JB MR0: doc is 16 rev 3