| commit | ed191db3a3bc2c18c8f21d9043343b2baad112fd | [log] [tgz] |
|---|---|---|
| author | Quddus Chong <quddusc@google.com> | Thu Apr 23 22:02:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 23 22:02:12 2015 +0000 |
| tree | fdeadea96cd6f83232db21caae6a33c3ce44bb62 | |
| parent | a1ab2d37a055f9c2d623260b41ecff778fdf3aa2 [diff] | |
| parent | 5dafb34bca889abb8776a320b1ed9544cff9f9b3 [diff] |
am 5dafb34b: resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev * commit '5dafb34bca889abb8776a320b1ed9544cff9f9b3': docs: Added 3rd-party Javadocs for GMS Parmesan release.