| commit | df3be538e0a3a5b0a248f36f2fcb4b190a3534f0 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Nov 25 15:09:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:09:33 2014 +0000 |
| tree | c6b1b76adc7772b8d1d2ec51567ab0ae7aca06ce | |
| parent | 9a4d0257beadf53c706afbcb4abc76c17a44ff00 [diff] | |
| parent | 9b4b2940b7697e626200a7ab82fbfa3bf99174fc [diff] |
am 9b4b2940: am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev * commit '9b4b2940b7697e626200a7ab82fbfa3bf99174fc': Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045