Dianne Hackborn d6b6709b21 Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev ...

am: 966f1c9

* commit '966f1c93487b8bc9e259de11e1aaf0fb35b11dc2':
  Fix issue #25817435: Batterystats missing UIDs for secondary users

2016-03-25 01:57:17 +00:00

..

java

Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev

2016-03-25 01:57:17 +00:00

jni

Merge "Add offset() to Path\'s fast-case mode" into nyc-dev

2016-03-24 05:07:10 +00:00

res

Merge "set default journal mode to TRUNCATE, not PERSIST" am: d4a9b5b

2016-03-24 22:46:57 +00:00

tests

Merge "Keyboard Shortcuts: plumb deviceId through" into nyc-dev

2016-03-24 13:37:26 +00:00