OSDN Git Service

Merge "Tone down a fatal assert" into jb-mr1-dev
authorMathias Agopian <mathias@google.com>
Fri, 5 Oct 2012 03:24:17 +0000 (20:24 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 Oct 2012 03:24:17 +0000 (20:24 -0700)
commite835976d285df80e261546bd4d016dadb45d906d
tree579ca6230810dbaef6e4e8c7250f5b8ffd26f421
parent27b28fd9960b73a1f13e22dd6655f75e2e76eef7
parent5a8f9012ee8bb9dc1ad14432b96a821f08802ee3
Merge "Tone down a fatal assert" into jb-mr1-dev