| commit | 8a0fd13081af16b18aaca6cb38ed9b252169df56 | [log] [tgz] |
|---|---|---|
| author | Sharvil Nanavati <sharvil@google.com> | Tue Jun 23 23:24:08 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 23 23:24:10 2015 +0000 |
| tree | eb7aa42a353a4b643fb0036bde5d39f880ff9e3c | |
| parent | 0ab731340b162a14eb49b8df78a0e96eb6e3a934 [diff] | |
| parent | e7908c7ff25e96b938271f7595f7da31cd77ae19 [diff] |
Merge "resolved conflicts for merge of 64a4858b to mnc-dev" into mnc-dev