tree 5de750ff499977cc2d0e0d6a3402dc4f866acc60
parent 829548a3cb92b8af24c0182b0f2193f38394464f
parent 2b4e612b1069fd60d58e06c9a37e7ae471d8976f
author Jason Monk <jmonk@google.com> 1472494636 +0000
committer android-build-merger <android-build-merger@google.com> 1472494636 +0000

Merge "Fix double status bar icons" into nyc-dev
am: 2b4e612b10

Change-Id: Ic50aea16f2c5dd14c56dac581f9780e49626ddb5