commit | bd4365494578e2f888df8789f458f66463b52781 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Feb 20 00:22:59 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 20 00:22:59 2015 +0000 |
tree | 180d022b7cb9ca0eac4b01f5c243b5a7d2bae897 | |
parent | df7fdad94fdfac68d0bc81d966961784da7832dc [diff] | |
parent | 35eb9ae37e8b9e2c6ff5ce4a14d17998cf3c2ad7 [diff] |
am 35eb9ae3: Merge commit \'418d8cac94a1e5f5dad0ee232197f2453a595c14\' into HEAD * commit '35eb9ae37e8b9e2c6ff5ce4a14d17998cf3c2ad7':