| commit | 03bf747fec291b355af531bf0b04a2b1669bf92e | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 20:56:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 20:56:31 2014 +0000 |
| tree | 4cb61b4b7be293b6335b04596df2c73cc54de58e | |
| parent | 4e8b055b2ad23f6e336872f775058bcf18c46dfd [diff] | |
| parent | 858ab06a38769aaa05a4b87a600739c9294b382d [diff] |
am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev * commit '858ab06a38769aaa05a4b87a600739c9294b382d': Fix style warnings in RenderSessionImpl [DO NOT MERGE]