| commit | 990fff1de51bfbc5b14881a8d18e035fc562adfa | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Thu Aug 20 16:38:56 2015 -0700 |
| committer | Miao Wang <miaowang@google.com> | Thu Aug 20 16:38:56 2015 -0700 |
| tree | d0965b3095965a6a0e0c763ce9038d5fbd4d460e | |
| parent | e42b345de44d5520b772db2842123daa7699d75d [diff] | |
| parent | 6fab6c4f83a8c580ccc86debf4955a345e5cc62b [diff] |
resolved conflicts for merge of 943fb864 to mnc-dr-dev-plus-aosp Change-Id: I8beb08d41faac1e74c344038efc3b9764e310b34