tree ba7bccf0a758da93655db357c6fe5a8f60f8e90b
parent 4cb03fa059d0145e81e624fddc4b57cb471bd786
author Dianne Hackborn <hackbod@google.com> 1432337684 -0700
committer Dianne Hackborn <hackbod@google.com> 1432337684 -0700

Revert "resolved conflicts for merge of 47249f2a to mnc-dev"

This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.