commit | 9b717aabe20cf4de8f9c6f6ac35ebc1b9542def9 | [log] [tgz] |
---|---|---|
author | Sebastien Hertz <shertz@google.com> | Wed Feb 18 08:34:36 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 18 08:34:36 2015 +0000 |
tree | 39d7eea0a9e97a9b6f22af9094fe9ec18d5cba48 | |
parent | 0b474276962ea845deccd904baebc5f5b3c0098f [diff] | |
parent | de7402182c1b020dec43aa38d62fa369a4ef52b8 [diff] |
am de740218: Merge "Follow up 129144" * commit 'de7402182c1b020dec43aa38d62fa369a4ef52b8': Follow up 129144