tree dc9e36d128ad319bb968d69d8f159d83367c0a91
parent 404f451a93d46d1d84e3bcb5e8221c3d0349a437
parent 85e51ae6902a825a7875a4f1ae3077d3fa7f2db8
author Alexandra Gherghina <alexgherghina@google.com> 1420712263 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420712263 +0000

am 85e51ae6: Merge "Cts tests for Settings intents" into lmp-mr1-dev

* commit '85e51ae6902a825a7875a4f1ae3077d3fa7f2db8':
  Cts tests for Settings intents