| commit | 66e6683193f6a1d071710ea8a39b02f5129fc505 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Tue Jul 21 15:41:08 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 21 15:41:12 2015 +0000 |
| tree | 035d01b67770308a8b94c7395b84bc43595203f0 | |
| parent | e99f20f5873c00b35f2407e28e06ff9119f85088 [diff] | |
| parent | b9935889b1be2aac4a47d1acbf7547a832edf9f3 [diff] |
Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev