tree e545f2f39c27b87b8890ac77a3431530948b4581
parent 9ffb424798bc47e22ff047f5d6424769711d59ac
parent fc66de023fb31bca739ede1ab5edfbe8799d30ba
author Esteban Talavera <etalavera@google.com> 1431972936 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431972937 +0000

Merge "resolved conflicts for merge of aa53ffbc to mnc-dev" into mnc-dev