OSDN Git Service

am 95b9a0b6: am e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev
authorMathias Agopian <mathias@google.com>
Fri, 5 Oct 2012 03:34:46 +0000 (20:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Oct 2012 03:34:46 +0000 (20:34 -0700)
commit8b2a88bad1d176560f34f348e54bad09acec7cdf
treeb67011fca1699b498b7904f4a9345323b3120121
parentb39844e25191a2828a85fbf682a892bc7f7ad3c4
parent95b9a0b688eab5a3c0c1fadb71e258e93e4c344c
am 95b9a0b6: am e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev

* commit '95b9a0b688eab5a3c0c1fadb71e258e93e4c344c':
  Tone down a fatal assert