tree d1ddf1dcc6cec1c1073849cdf554b9c860d242c6
parent 7e5a2d86cf683333061a039263b8128ff40589db
parent 7c0393abdf121aca271f870d492def5b329b6360
author Greg Kaiser <gkaiser@google.com> 1460410546 +0000
committer android-build-merger <android-build-merger@google.com> 1460410546 +0000

Merge "NanoApp: Make indentation consistent" into nyc-dev
am: 7c0393a

* commit '7c0393abdf121aca271f870d492def5b329b6360':
  NanoApp: Make indentation consistent

Change-Id: Ib1cdcfc2fe61266d4fcac44739f9273737108f56