| commit | 25d12e3f6a5ef15add0c0ccb560bb842283b98e2 | [log] [tgz] |
|---|---|---|
| author | Cedric Ho <cedricho@google.com> | Mon Apr 27 20:58:12 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 27 20:58:13 2015 +0000 |
| tree | d6aa5e0b4b355d067b3b19b77773393223df3796 | |
| parent | c0f705a81023f6491a6965c6c0d205f4bd3b3ee8 [diff] | |
| parent | 4e41767977257a2b949f95a7ecb9b7ab4d1cdf10 [diff] |
Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev