Chien-Yu Chen d5cc64f349 Merge "camera2: Fix template requirements" into oc-dev ...

am: 2976109d89

Change-Id: I26487e8565aa190cff6e470bfdbc312b5ec83ceb

2017-08-02 19:56:55 +00:00

..

java

Merge "camera2: Fix template requirements" into oc-dev

2017-08-02 19:56:55 +00:00

jni

Merge "Add hwbinder library"

2017-08-02 16:57:50 +00:00

proto/android

Prune unused static libs and instant apps if space needed

2017-05-31 02:30:41 +00:00

res

Import translations. DO NOT MERGE

2017-07-25 21:15:58 -07:00

tests

Merge "Remove unnecessary TODOs"

2017-07-17 22:26:48 +00:00