Fyodor Kupolov 0ebf3cc47c Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev ...

am: 2c5cbd4012

* commit '2c5cbd4012aef736c94a7afc84a778623c639d10':
  Clean up demo dir when leaving demo mode

Change-Id: Ia7891f8e5106130d669a1daa7fcc691db1f5e4c7

2016-05-27 00:54:20 +00:00

..

java

Merge "Clean up demo dir when leaving demo mode" into nyc-mr1-dev

2016-05-27 00:54:20 +00:00

jni

Merge "Force pending transactions to flush before screenshot." into nyc-dev am: 39e8022a75

2016-05-25 19:26:36 +00:00

res

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

2016-05-26 16:55:58 +00:00

tests

Merge "Improve performance of LocaleList with Resources" into nyc-dev

2016-05-24 21:35:56 +00:00