| commit | 161309f94ec459569eb404d10bab615294541a87 | [log] [tgz] |
|---|---|---|
| author | Andriy Naborskyy <andriyn@google.com> | Fri Mar 25 01:11:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 25 01:11:19 2016 +0000 |
| tree | d88c07448e97b914c3dd375adc41eb77de2afb6e | |
| parent | 186b0e2cd4552a926af6bb4cce9c227cfa3bbcab [diff] | |
| parent | 669cacac70b56c72e520849e54ada458b36e23b1 [diff] |
Merge "resolve merge conflicts of 0c7535b to nyc-dev" into nyc-dev am: 669caca * commit '669cacac70b56c72e520849e54ada458b36e23b1': bootanimation: implement split packaging of animation