Commits
Dan Sandler authored and Android Git Automerger committed 415c6cb2358M
am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev * commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5': "I tried to think of the most harmless thing."
Showing diff toa5e012e6236