| commit | 91ce3576337b0541912da7ec4b1efd802568dfce | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Nov 03 20:53:28 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 03 20:53:28 2014 +0000 |
| tree | 5d2712f30933dd01053cb62c0410361076ed434f | |
| parent | 66f0d93c265657e17c7a1ddd74beb61070a8df69 [diff] | |
| parent | e916313defbd09479dc29d38f3aa467f3b296f7c [diff] |
resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313 * commit 'e916313defbd09479dc29d38f3aa467f3b296f7c':