Zhijun He 9f8e82ed96 am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b ...

* commit 'f7f131105d479d30b53b2366e29278fd09f36065':
  camera-metadata: clarify the AE precapture trigger spec

2015-02-08 21:12:44 +00:00

..

java

am f7f13110: Merge "camera-metadata: clarify the AE precapture trigger spec" into lmp-mr1-dev automerge: 07c745b

2015-02-08 21:12:44 +00:00

jni

am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.

2015-01-27 23:02:57 +00:00

res

Merge "Add voice assist action for global actions." into lmp-mr1-modular-dev

2015-02-06 23:05:05 +00:00

tests

am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:24:43 +00:00