Christoph Studer d7192c6384 am df9e20f2: Merge changes Iffd15e95,Id2db95ec ...

* commit 'df9e20f28839a61dd487c2a67f914e87da1dede9':
  Log notification clicks
  Add userId to StatusBarNotification key

2014-05-05 19:07:50 +00:00

..

java

am df9e20f2: Merge changes Iffd15e95,Id2db95ec

2014-05-05 19:07:50 +00:00

jni

camera3: Update CameraMetadata vendor tag handling.

2014-05-02 20:34:41 -07:00

res

am 644aec25: Merge "Further work on voice interaction services."

2014-05-05 18:34:43 +00:00

tests

am 9284a37d: am 1edfd835: Merge "add getAddress function to return BT mac" into klp-modular-dev

2014-05-03 00:39:06 +00:00