| commit | 28f19700fe2b6f8101fc56f75375c5d8c1b0ca68 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Jun 21 23:34:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 23:34:14 2016 +0000 |
| tree | 58fa454855d362ee8b0243fa6e961063911a4d72 | |
| parent | e24d29375b1550b196743eeda405daac6e95356e [diff] | |
| parent | 90f05048bf0c112900272b178ca8d785b779c168 [diff] |
Merge \\\\\\\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\\\\\\" into lmp-dev am: f832feb17b -s ours am: 817545929d am: 4ba6f225ec am: 75344f8bcf -s ours am: 3fc43fc1bc am: e933b06ea8 am: 5fda9b4ea6 am: 9f308209fa -s ours am: 11ec2fe22d am: 90f05048bf Change-Id: Id419eb0f329ec3324bc7172d2634a0f1d137d470