| commit | 5acf640dfab01a525b832c92ce63eacf2e2146b4 | [log] [tgz] |
|---|---|---|
| author | George Mount <mount@google.com> | Wed Jul 02 14:24:09 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 02 05:06:31 2014 +0000 |
| tree | cb0b81285f12d52d5a92a7c9ebc9e284fe04adbe | |
| parent | 4cce48e63fe9d63bac1f5a3b43ebb3ec6a1a730b [diff] | |
| parent | 7e20884d85a68d0f22f2b0a37b8164497b146010 [diff] |
Merge "Reapply fix after bad merge."