Zhijun He 5745f4ce55 Merge "Camera2: add deferred output config support" into nyc-mr1-dev am: e8526a0105 ...

am: f103fd540e

* commit 'f103fd540e54dddc370aa1049424a7644c889e08':
  Camera2: add deferred output config support

Change-Id: I7662286b333ccce5e18399fd84efb07e167936ea

2016-06-03 02:14:59 +00:00

..

java

Merge "Camera2: add deferred output config support" into nyc-mr1-dev am: e8526a0105

2016-06-03 02:14:59 +00:00

jni

Merge "Use SkMatrix to compute pdf transformation."

2016-05-31 23:32:18 +00:00

res

Merge "Round icons" into nyc-mr1-dev am: 7d64d64269

2016-06-03 00:44:54 +00:00

tests

Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 am: 7a845c5283

2016-05-31 21:15:31 +00:00