| commit | 12832770cd0e37c45c0ece095e893cdfb2b0016e | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Mon Jun 23 20:59:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 20:59:02 2014 +0000 |
| tree | bb1dc307c2e50e5df94e485cd50018c5c2ffe663 | |
| parent | e3314b094fda992cfdf504967b539b7c27cabb61 [diff] | |
| parent | cc9d3ec81ce751e1b924d8e659e17df3628f73c5 [diff] |
am cc9d3ec8: am bbeed672: Merge "Fix ALOG_ASSERT" * commit 'cc9d3ec81ce751e1b924d8e659e17df3628f73c5':