| commit | b161d6ba7f85b49e4e19d69bd107d30cdd3c0bc1 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:42:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:42:00 2014 +0000 |
| tree | 202ab614d811c9d4850e4653ac024c17cf753170 | |
| parent | cc9e359699e9464ac8a8d6bbd4f12c23a0009d3c [diff] | |
| parent | 673d9734c2d9b62ecd41dcac3c730d242952989e [diff] |
am 673d9734: resolved conflicts for merge of 00d09649 to jb-mr1-dev * commit '673d9734c2d9b62ecd41dcac3c730d242952989e': Fix style warnings in RenderSessionImpl [DO NOT MERGE]