| commit | 4f913049eba673cfc784097183fffb6a555099ee | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Mon Jun 08 15:04:56 2015 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Mon Jun 08 15:04:56 2015 -0700 |
| tree | 04560870ab8bf3ac2ac8be4012e9a49295295c3d | |
| parent | fe7f24e414e3f597adf6bad0ccdf21407bc17d73 [diff] | |
| parent | cb7aff0b71111c40c7ad7faa89852aac2fd13d5d [diff] |
resolved conflicts for merge of cb7aff0b to mnc-dev-plus-aosp Change-Id: I395708857da8736f67eba557f73ad6f0885b6c92