OSDN Git Service

Merge "Settings Hooks launch wrong activity" am: 69704608f4
authorJason Monk <jmonk@google.com>
Fri, 15 Jan 2016 14:31:40 +0000 (14:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jan 2016 14:31:40 +0000 (14:31 +0000)
commit28abc772a1a2d8bf1bc41c7a3f7d7d4c52c69af1
tree6190a0cbb846703fe5e3ff24d634ac6ed8b1f2f5
parent2043fd98a3f821e270d3e1e72f94acd9dce94be5
parent6cbc7e4f85a17c49d787025fbd73c7ebe3b0385b
Merge "Settings Hooks launch wrong activity" am: 69704608f4
am: 6cbc7e4f85  -s ours

* commit '6cbc7e4f85a17c49d787025fbd73c7ebe3b0385b':
  Settings Hooks launch wrong activity