• Nick Kralevich's avatar
    resync with AOSP master · d84d9f86
    Nick Kralevich authored
    Merge conflict resolution patch 11a29f29
    inadvertently dropped a comment line. Pick it back up.
    
    Change-Id: I0f7a7cdbdacafb86610595ee616e84a06da50a17
    d84d9f86
te_macros 11.5 KB