| commit | 4a88c2cae0ee48a69a803a491ebd5192fb55c3c4 | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu Jan 22 07:36:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 07:36:13 2015 +0000 |
| tree | 98e2eb7e41db32aaea6634bf75a100eab2fa5317 | |
| parent | 51706538b9deed39280fcd580baf7741781844ef [diff] | |
| parent | 6d6e0e22b8358c73519e811dc37ecb0105adb8d4 [diff] |
am 6d6e0e22: am 0ff51b15: Merge "Follow up on CL 123650" * commit '6d6e0e22b8358c73519e811dc37ecb0105adb8d4': Follow up on CL 123650