tree 6b44d80fe2a6b109e3caffeebe8f727b4cbe9ab5
parent be925017201ad547a72e8d1e333dbc7eae3fc76f
parent 06d3df9aa05a0221a4cdc4245ae73f7936616170
author Jake Hamby <jhamby@google.com> 1342738946 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342738946 -0700

am 06d3df9a: Merge "Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony"

* commit '06d3df9aa05a0221a4cdc4245ae73f7936616170':
  Move SmsUsageMonitorShortCodeTest to frameworks/opt/telephony