diff options
| author | Heidi von Markham <hvm@google.com> | 2015-06-06 00:17:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-06 00:17:42 +0000 |
| commit | ea5d021615bb14ff94e55a4234c2dffaad2c318f (patch) | |
| tree | 9b41571b43ac30a9eb942776bc43482429e4d066 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3b474e520f8335f4567b3da743599bb447e215fd (diff) | |
| parent | 25af46b07d0dbe0f5800a17c231942e4eea7aa99 (diff) | |
am 25af46b0: Merge branch \'mnc-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev
* commit '25af46b07d0dbe0f5800a17c231942e4eea7aa99':
Camera2: add missing HFR implementation
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions