Shawn Willden 1bed39a5e4 am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." ...

* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.

2015-03-19 00:42:09 +00:00

..

java

am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE."

2015-03-19 00:42:09 +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