tree ae0cb4355ba25d493b3f8dd2a5b9828030aef841
parent 7579cfbdd481690e317609e2e059d7eee67aba10
parent db2c8c060a8f3bafc7f48332e0f3fd5af7e8d0e4
author Takayuki Hoshi <hoshi@google.com> 1442707958 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442707958 +0000

am db2c8c06: am 9c072750: am 68488024: am 0e7c5837: am b40bc889: Merge "Disable Notification Package Prior item for the watch feature" into lmp-sprout-dev

* commit 'db2c8c060a8f3bafc7f48332e0f3fd5af7e8d0e4':