tree 40702eb3d6b79c0e288f5258d7165fb8474aafd3
parent 359acdee5faff503b2a859e8747aabe8fcbec350
parent fc27d96bcdec7544e2933b855cf7408c43cb8768
author Jason Monk <jmonk@google.com> 1467318299 +0000
committer android-build-merger <android-build-merger@google.com> 1467318299 +0000

Merge \"Status bar blacklist: fix items resetting\" into nyc-mr1-dev
am: fc27d96bcd

Change-Id: I934f88b5b97a9fb24f1e991af9c11f5fdcf4bd91