tree e34d989f7803872799ad431ec3695fb38c2dffc4
parent d16a7bc2b393d875717b1237c957d5896f08029d
parent 42da80fe21b68e429c5afb0edde7b60aa6ee1e7f
author Amit Mahajan <amitmahajan@google.com> 1435356228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435356228 +0000

am 42da80fe: DO NOT MERGE Change to make STK related intents protected.

* commit '42da80fe21b68e429c5afb0edde7b60aa6ee1e7f':
  DO NOT MERGE Change to make STK related intents protected.