| commit | 501c24e94bc2d2d4640385ed39e890bf63558c7e | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Thu Apr 03 10:35:53 2014 -0700 |
| committer | Dmitriy Ivanov <dimitry@google.com> | Thu Apr 03 12:51:31 2014 -0700 |
| tree | be596a2c5780e22879c8dfa4b3d9c16112405391 | |
| parent | a666812d3da5d0ef2378e32d2fe14dfc4670e8fc [diff] |
(semi)automated merge with upstream Change-Id: I5b5521c587fc041af24ad1d6606d3b3293161a6c