| commit | 3fff22173c7010467ce9e134e89b367e311d122b | [log] [tgz] |
|---|---|---|
| author | Vinit Deshpande <vinitd@google.com> | Tue May 20 19:06:45 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 20 19:06:45 2014 +0000 |
| tree | 38cfc07b6fe6ab96b50d2387a52ffb1109e5f468 | |
| parent | eeb11cde21a468ddec1caf32b9526c63fc1e8585 [diff] | |
| parent | e715e8cc00de841d690bddd1e17741a0e9b05293 [diff] |
Merge "Fix a runtime break caused by merge conflict"