| commit | 91fdd1a3219ba514a127d553878b582bc13e903f | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Thu Aug 06 10:57:57 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Thu Aug 06 10:57:57 2015 -0700 |
| tree | d916be566863fc03a63cd049093af05759032b9b | |
| parent | 4a368585a5f8ae44146c222f6e4b6050e583939e [diff] | |
| parent | 610520ad206fcb886c6c09f763f434caac8531ff [diff] |
resolved conflicts for merge of 610520ad to mnc-dev-plus-aosp Change-Id: I55ad47c70091d4f42f83783e9876846f19e2a777