tree 487ed74c68d4553c46e3e0392125393eb819858b
parent d548f4a6e7542f7768252be0a855e0cb9d7f4772
parent a6c9a892365864f715da31210304cdc3ada6a15b
author Julia Reynolds <juliacr@google.com> 1461685410 +0000
committer android-build-merger <android-build-merger@google.com> 1461685410 +0000

Merge changes from topic \'api_review\' into nyc-dev am: a0676c9
am: a6c9a89

* commit 'a6c9a892365864f715da31210304cdc3ada6a15b':
  Api review: Settings.
  Reduce spacing.

Change-Id: I4922a4e4beb8544c10e246b764097048328ec20e