Felipe Leme b147de882a Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev am: a4dffa032b ...

am: 705d318485

Change-Id: I75ff776435f53c8aed5731dfe984813af48c760a

2017-10-11 20:20:09 +00:00

..

java

Merge "Document how to handle save on multi-steps activity." into oc-mr1-dev am: a4dffa032b

2017-10-11 20:20:09 +00:00

jni

Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314 am: 6f42d696df

2017-10-11 16:28:26 +00:00

proto/android

incidentd: Dumping batterystats system data to proto.

2017-10-09 14:29:40 -07:00

res

Merge "Import translations. DO NOT MERGE"

2017-10-11 19:52:02 +00:00

tests

Merge "Attribute UNKNOWN display state to OFF"

2017-10-11 17:36:03 +00:00