Michael Kwan d1457eea49 Merge "Modify time only mode flag into set of values instead of just one." into pi-dev am: c5d0ed9f3c ...

am: 74d615f1ac

Change-Id: I98aaa71b0988e96d079ed1813dbb777565c3d655

2018-03-17 22:39:28 +00:00

..

java

Merge "Modify time only mode flag into set of values instead of just one." into pi-dev am: c5d0ed9f3c

2018-03-17 22:39:28 +00:00

jni

Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev am: 71ed54f377

2018-03-16 16:35:55 +00:00

proto

Modify time only mode flag into set of values instead of just one.

2018-03-16 12:34:19 -07:00

res

Merge "Update USB charging strings" into pi-dev am: f836c8940a

2018-03-16 04:32:49 +00:00

tests

Merge "Modify time only mode flag into set of values instead of just one." into pi-dev am: c5d0ed9f3c

2018-03-17 22:39:28 +00:00