| commit | 92b28f37de9956c172f779df4cf540abc5b94deb | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Mon Sep 28 11:20:38 2015 -0700 |
| committer | Todd Kennedy <toddke@google.com> | Mon Sep 28 11:20:38 2015 -0700 |
| tree | 0703b49c1e016d7950898c56cd9824852d0e6946 | |
| parent | 9f8602644418ecfb1a5c9555792ceed285fa72bd [diff] | |
| parent | 4ed21bf038742b0136c1bc107198ffcbb6d4b979 [diff] |
resolved conflicts for 4ed21bf0 to stage-aosp-master Change-Id: I9c8ab83589ee3786c884f34066c1f3d709dc5136