| commit | e32e311a1159d03cda7791880bb5a32ca1d5e37f | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Mon Oct 07 14:58:04 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 07 14:58:04 2013 -0700 |
| tree | 99c43eedf63f9ed622bbc6b36d7ac65db7765bbe | |
| parent | 5e02e0a9e1e075e3d451d929b0a67bf280c432ed [diff] | |
| parent | c37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73 [diff] |
am c37a5ab5: Merge "Camera2: fix Face class java doc build break" into klp-dev * commit 'c37a5ab54e5e3ad3bb816d7c9e2b923af6f74f73': Camera2: fix Face class java doc build break