tree ac5fd0507e5450642e1799bf8bf52a499dcb49d1
parent 807f6ac61c3a1f3affaaa20747c0f159896ce445
parent 599b8bd35018b691e06e89902afcadc9dfeec26a
author Eino-Ville Talvala <etalvala@google.com> 1421971526 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421971527 +0000

Merge "Camera2: Add tests for the StreamConfigurationMap class" into lmp-mr1-dev