| commit | 80bee1ee989a9522fc58c66fc8d6c0f40d7e630e | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 08:02:49 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Wed Sep 16 08:02:49 2015 -0700 |
| tree | ae09e3448067530287e9e994cb05d3c44eaeb22c | |
| parent | 0bd6407666aa4d7b0a031900b4bb1c9103eb9bc5 [diff] | |
| parent | f49f5d1f4b5eecbb163c7b8f6b8c2ccf5e70285d [diff] |
resolved conflicts for f49f5d1f to stage-aosp-master Change-Id: I35836b08d8ead64af04729f7e39cc5b79b97d38c