tree c843bd1d64d911c89921dbf3d93c1c3233830c36
parent cd10a1fce1a49f583e237381f06de0b53f033a73
parent a9db1aa382cee3e70957e696d16ac86600d52c3f
author Andrew Sapperstein <asapperstein@google.com> 1466707960 +0000
committer android-build-merger <android-build-merger@google.com> 1466707960 +0000

Merge \"Fix crash when tapping on cell icon in QS.\" into nyc-mr1-dev
am: a9db1aa382

Change-Id: Iddda5d785c1dd2d128d2972525d03451a27c3edc