| commit | da7a00a208de6dcfbadc1651b50875592616fca3 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Mon Oct 07 15:12:19 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 15:12:19 2013 -0700 |
| tree | d8bc34214e36bcb94d18b00282d16fbdb5ce5e8c | |
| parent | 9d1383c61ca0932cb36b104a89c32db15de6a10e [diff] | |
| parent | e32e311a1159d03cda7791880bb5a32ca1d5e37f [diff] |
am e32e311a: am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev * commit 'e32e311a1159d03cda7791880bb5a32ca1d5e37f': Camera2: fix Face class java doc build break