| commit | 47a20d81e890012821e0cc3bf31bbb6a6d17400e | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Sat Nov 15 04:54:44 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Nov 15 04:54:44 2014 +0000 |
| tree | a000943a0176175d4fb184dd9fc2d6a4848aab26 | |
| parent | debc2a5fb358bc8af5734aa0c7114b6ca38d28b4 [diff] | |
| parent | f6f6d69795e09f6d2c3caeec792701a33dc3ae45 [diff] |
resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 * commit 'f6f6d69795e09f6d2c3caeec792701a33dc3ae45':