| commit | dd5ee4b89083ec9b50b8c9739274136b0c74abb5 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Sat May 23 00:34:34 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat May 23 00:34:35 2015 +0000 |
| tree | 9b1d3a1842061ee23f76cd14a5864e06e918dd36 | |
| parent | aefdaa5cbd2a68aa6c8e7d229b897237562cebcb [diff] | |
| parent | 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 [diff] |
Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev