OSDN Git Service

Merge \"Check for null activity before getting dashboard categories.\" into nyc-mr1-dev
authorDoris Ling <dling@google.com>
Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 01:42:47 +0000 (01:42 +0000)
commit8847c70b614524ba8500d4eef291b9402a985223
tree43051314ec57487c8d6264ae8e44f6f9c3ac8999
parent4ec4b64b9d6f14ed59b8e876b6268f78d21d8bb3
parent7b03ae69df53d651c7ebf334e2b15f684c79cbf8
Merge \"Check for null activity before getting dashboard categories.\" into nyc-mr1-dev
am: 7b03ae69df

Change-Id: Ic16c06b1ced6c4b9f37d0c5e8fc0ecc5a450044f