Shawn Willden 615f39f911 am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 ...

* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.

2015-03-19 00:41:58 +00:00

..

java

am 254c58c4: Merge changes Id9a22ad3,I629ab2c4

2015-03-19 00:41:58 +00:00

jni

Merge "Change jit properties to be debug properties"

2015-03-17 02:04:34 +00:00

res

am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev

2015-03-19 00:21:13 +00:00

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00