| commit | 383ed29e47ff27ba836f88427aa83215aa07d356 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Mar 07 20:15:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 20:15:51 2014 +0000 |
| tree | 6927550349038c8c9a11400cb29ac39e6d64f2c0 | |
| parent | 36577bf07af177128fd39ebbce5e87d8fb5d760e [diff] | |
| parent | 0c1e0eee6cee85275558ec52574bfb59317279bf [diff] |
am 0c1e0eee: am f4a172a2: Merge "Fix incorrectly worded assertion failure." * commit '0c1e0eee6cee85275558ec52574bfb59317279bf': Fix incorrectly worded assertion failure.