| commit | 2f30ba2e5745ef1a4268c45c13709c0a27fab5b2 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Nov 03 23:48:27 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 03 23:48:27 2014 +0000 |
| tree | a6dd071663e2b509e037e00b467f971d09b89703 | |
| parent | 0f6def890cf03a3e1997af525ad57ed18a56d927 [diff] | |
| parent | a228c63288142ca157ae28f63e0d3e0013ae62cb [diff] |
am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313 automerge: a228c63 * commit 'a228c63288142ca157ae28f63e0d3e0013ae62cb':