tree 31930a291c99fe616059e735ef57023eff11a9c7
parent c6cd58267bd8b0d7b1fd42787a31562307de8ab2
parent 3a39cfb0cb8328c512aeb3bf93d0d8b28659032c
author Stephen Hines <srhines@google.com> 1440672583 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672583 +0000

am 3a39cfb0: (-s ours) am 0896d8e6: am b49f3460: Merge "Fix alias metadata issues."

* commit '3a39cfb0cb8328c512aeb3bf93d0d8b28659032c':