| commit | 634ecc229ea958e2e090fa8ee34a15ff258b0a37 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Fri Apr 04 03:19:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 03:19:01 2014 +0000 |
| tree | be596a2c5780e22879c8dfa4b3d9c16112405391 | |
| parent | cef9817953a97cbdf7a87df592b953f9a59877fe [diff] | |
| parent | 7f541f7e08792f22d911377d6ea52ce6d870c965 [diff] |
am 7f541f7e: Merge "(semi)automated merge with upstream" * commit '7f541f7e08792f22d911377d6ea52ce6d870c965': (semi)automated merge with upstream