tree e2ed0c960ff7183b04448d1674ef276eadf7d684
parent 5317c2b7adfbfef97edc6ad9b7e007160ef689f4
parent 0eb687fdc431e7eae4e8f2f4d5dd3a6e48779008
author Dan Sandler <dsandler@android.com> 1389627340 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1389627340 +0000

Merge "Quick patch for b/12446428." into jb-ub-now-kermit