Zhijun He 8fcc25dade Merge "Camera2: update API per API council review" into nyc-dev am: b0fe2a9 ...

am: c2ec322

* commit 'c2ec3226ea018e415c57871727c34d44abd80ca4':
  Camera2: update API per API council review

Change-Id: I4ad3be32bee216a92731b07901a661c1ce0463b3

2016-04-09 05:57:41 +00:00

..

java

Merge "Camera2: update API per API council review" into nyc-dev am: b0fe2a9

2016-04-09 05:57:41 +00:00

jni

resolve merge conflicts of 0e89f98 to nyc-dev-plus-aosp

2016-04-08 20:48:35 +00:00

res

Merge "Customizes input extract edit view for Wear" into nyc-dev am: 4430308

2016-04-09 05:55:32 +00:00

tests

Merge "Added Notification Stress Tests" into nyc-dev am: fc90ffe

2016-04-08 17:13:36 +00:00