| commit | cf2af66180e7debda36a1cece4732d0403ce37b7 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 21:12:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 21:12:29 2014 +0000 |
| tree | 1ce19922396c657ebbc4d4da545cfa976999429d | |
| parent | 11243dd66484d0f99f56454491d5d82acfca6070 [diff] | |
| parent | 752b90f2605956e0de880c2a406dc887aeb3d8c2 [diff] |
am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev * commit '752b90f2605956e0de880c2a406dc887aeb3d8c2': Fix style warnings in RenderSessionImpl [DO NOT MERGE]