| commit | b3e8bd1842bed254561918f3d6467334eba2111a | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Oct 08 21:32:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 21:32:58 2015 +0000 |
| tree | 60bb765fa15e9cac3f1236c2399d6abf107ca65d | |
| parent | 43b95dcff1befabec0cf57a32e4c2a5b398bcc40 [diff] | |
| parent | 96e59f2c34b3174f31b7c7c9ce0a995acb90a6c4 [diff] |
am 96e59f2c: Merge commit \'f414f45e1d99b6fcfd8c451cf6880c3b78a6bf84\' into HEAD * commit '96e59f2c34b3174f31b7c7c9ce0a995acb90a6c4':