| commit | 5d0766a80e4f2252ac5f9fd50a3868362ca8390a | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Mon Dec 15 07:39:52 2014 -0800 |
| committer | smain@google.com <smain@google.com> | Mon Dec 15 07:39:52 2014 -0800 |
| tree | 7bb34d6f3fb6e0a52c2d58f485680de7018da593 | |
| parent | b953e28e895d2199d5e46ac36898f7d688a03db3 [diff] |
followup fix to conflict resolution in Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6 Change-Id: I5796348197732f6c9e72fcbdbca5fcd4934f8994