tree ad8c66a16439e121c44a2017a0681e163002e844
parent bab2b5948a6d28f3bbe4981f2b6f172de292d456
parent 9ff69bd8f115e70a16c72c798449908536a173ea
author Jason Monk <jmonk@google.com> 1417732316 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417732318 +0000

Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev