commit | 5b654f15313f1ad27246269f6e34214ddb798405 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Mon May 19 22:37:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 19 22:37:29 2014 +0000 |
tree | 69b9404739c965091bfbaa4ae920e9ba4992ffdc | |
parent | 121f209d3ea770109c9ebe0b6f8a965f91d5a2ef [diff] | |
parent | 201bf6769fec1bb01446d25e6efad0bf10c39296 [diff] |
am 201bf676: Merge "Really fixes the ub branches" * commit '201bf6769fec1bb01446d25e6efad0bf10c39296': Really fixes the ub branches