commit | b2d435bdf685554347a36ccc89f82d1f5a66b934 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Tue Jul 22 20:11:14 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 22 16:29:55 2014 +0000 |
tree | 67638972ec8d34cf8baa72a7f13f1cc18bc8445c | |
parent | 35bdd4b1d2aaeedacb3d6ffddb5e33ff7af2a369 [diff] | |
parent | 68a26ca32c8777223fd535138dc5ed930068c4d3 [diff] |
Merge "camera: Annotate public/synthetic keys in the java code" into lmp-dev