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