tree 369263eb5dd2d82ed5c3ade0c15e8a49035ba1a1
parent 121fa21ef95f9ef6820a5b3756b922a24e5cc14b
parent 2c5cbd4012aef736c94a7afc84a778623c639d10
author Fyodor Kupolov <fkupolov@google.com> 1464310460 +0000
committer android-build-merger <android-build-merger@google.com> 1464310460 +0000

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