| commit | 07bb4c3063f0ffd32785726ea1c4a485b6155cf0 | [log] [tgz] |
|---|---|---|
| author | Vinod Krishnan <vinodkrishnan@google.com> | Fri May 09 21:11:08 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 09 21:11:08 2014 +0000 |
| tree | 19f9772a49699ac86e81cc9ad1d943a7aaf70bb0 | |
| parent | 0f94e3f5ede4ab16c0ef4a4b36f03e9a98fa05ac [diff] | |
| parent | 4a3735d0810d641ef0fab3f3c0705a8a861f26a9 [diff] |
Merge "resolved conflicts for merge of 88aa8aab to master"