tree 870c18c69a998e0d588258cc06eb8dbf0c5f1323
parent f5505d1d04b097bf1857970e34de54b86b6d0bd7
parent 8af20ef6a885a50694805a066f02fc643e80b837
author Jason Monk <jmonk@google.com> 1460487969 +0000
committer android-build-merger <android-build-merger@google.com> 1460487969 +0000

Merge "The return and fixing of demo mode" into nyc-dev
am: 8af20ef

* commit '8af20ef6a885a50694805a066f02fc643e80b837':
  The return and fixing of demo mode

Change-Id: I34d6d6dba5797b926a9ce61bd9670ea910f3e7b7