commit | 566e0bd56399a64807ba588bc9460847280c866b | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Fri Mar 07 20:15:48 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 20:15:48 2014 +0000 |
tree | af6849e333a82cbfd5f29ff611019b7ca8ce214f | |
parent | f49076acaab56785d00aebca55c887bb6c475bbc [diff] | |
parent | 6b0afa7eecaa2e4faff5b12218af692a363d3d53 [diff] |
am 6b0afa7e: am 36e3fb8d: am 7a6bd46d: Merge "A couple of fixes" * commit '6b0afa7eecaa2e4faff5b12218af692a363d3d53': A couple of fixes