tree 8e1d17a5f034bc19236d4fba05934b61a81d0749
parent d3b009ae55651f1e60950342468e3c37fdeb0796
parent d4b7315d551cc8a930c88e27ba623b3ac38f196a
author Mike Dodd <mdodd@google.com> 1439419789 -0700
committer Mike Dodd <mdodd@google.com> 1439419789 -0700

Merge d4b7315d551cc8a930c88e27ba623b3ac38f196a to mnc-dev-plus-aosp to fix build.