| commit | 0baa12cee365cd16ce20d86d0ce7042310cd6393 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Mon Dec 15 15:56:53 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 15 15:56:55 2014 +0000 |
| tree | 894ffadd2d10741c44589f9661971e9ed7a49a64 | |
| parent | d1141978f5b95860c654cbf5685e2a6c47449df3 [diff] | |
| parent | 5d0766a80e4f2252ac5f9fd50a3868362ca8390a [diff] |
Merge "followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6"